From 3f126c7fc8687e1ca33badef81b5156446a061ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 15 Jul 2018 17:51:47 +0200 Subject: [PATCH] Remove GTK_CSS_AFFECTS_CLIP Clips don't exist anymore and this flag is unused outside of the style property definitions in gtkcssstylepropertyimpl.c --- gtk/gtkcssstylepropertyimpl.c | 12 ++++++------ gtk/gtkcsstypesprivate.h | 8 ++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 0d1be84071..ac8cf75974 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1182,7 +1182,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_BOX_SHADOW, G_TYPE_NONE, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_BACKGROUND, box_shadow_value_parse, NULL, _gtk_css_shadows_value_new_none ()); @@ -1360,7 +1360,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_OUTLINE_STYLE, GTK_TYPE_BORDER_STYLE, 0, - GTK_CSS_AFFECTS_OUTLINE | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_OUTLINE, parse_border_style, query_border_style, _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); @@ -1368,7 +1368,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_OUTLINE_WIDTH, G_TYPE_INT, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_OUTLINE | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_OUTLINE, parse_border_width, query_length_as_int, _gtk_css_number_value_new (0.0, GTK_CSS_PX)); @@ -1376,7 +1376,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_OUTLINE_OFFSET, G_TYPE_INT, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_OUTLINE | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_OUTLINE, outline_parse, query_length_as_int, _gtk_css_number_value_new (0.0, GTK_CSS_PX)); @@ -1581,7 +1581,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_SHADOW, G_TYPE_NONE, GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON, shadow_value_parse, NULL, _gtk_css_shadows_value_new_none ()); @@ -1597,7 +1597,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_TRANSFORM, G_TYPE_NONE, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_CONTENT | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_CONTENT, transform_value_parse, NULL, _gtk_css_transform_value_new_none ()); diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h index eb6d6fab07..218a15980c 100644 --- a/gtk/gtkcsstypesprivate.h +++ b/gtk/gtkcsstypesprivate.h @@ -109,9 +109,6 @@ typedef guint64 GtkCssChange; * @GTK_CSS_AFFECTS_SYMBOLIC_ICON: Symbolic icons and their rendering is affected. * @GTK_CSS_AFFECTS_OUTLINE: The outline styling is affected. Outlines * only affect elements that can be focused. - * @GTK_CSS_AFFECTS_CLIP: Changes in this property may have an effect - * on the clipping area of the element. Changes in these properties - * should cause a reevaluation of the element's clip area. * @GTK_CSS_AFFECTS_SIZE: Changes in this property may have an effect * on the allocated size of the element. Changes in these properties * should cause a recomputation of the element's allocated size. @@ -135,9 +132,8 @@ typedef enum { GTK_CSS_AFFECTS_ICON = (1 << 7), GTK_CSS_AFFECTS_SYMBOLIC_ICON = (1 << 8), GTK_CSS_AFFECTS_OUTLINE = (1 << 9), - GTK_CSS_AFFECTS_CLIP = (1 << 10), - GTK_CSS_AFFECTS_SIZE = (1 << 11), - GTK_CSS_AFFECTS_POSTEFFECT = (1 << 12) + GTK_CSS_AFFECTS_SIZE = (1 << 10), + GTK_CSS_AFFECTS_POSTEFFECT = (1 << 11) } GtkCssAffects; #define GTK_CSS_AFFECTS_REDRAW (GTK_CSS_AFFECTS_CONTENT | \ -- 2.30.2